Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

miscellaneous small cleanups #62

Merged
merged 6 commits into from
Mar 4, 2023
Merged

miscellaneous small cleanups #62

merged 6 commits into from
Mar 4, 2023

Conversation

hramrach
Copy link
Contributor

No description provided.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Copy link
Owner

@arakiken arakiken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.
These Makefiles are necessary to build mlclient and mlcc without executing ./configure.
I sometimes want to build just these tools on old machines where it takes many hours to execute ./configure script, so I place these Makefiles on purpose.
Don’t delete them.

configure.in unconditionally prints XIM as input method but it is only
available with xlib UI. Skip it for other UIs.

Also regenerate configure.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Use pkgconfig to detect include path required for building wayland
backend. Do not hardcode wayland libraries, use pkgconfig to detect
them.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
@hramrach
Copy link
Contributor Author

hramrach commented Mar 4, 2023

That also means that every time you do run configure these makefiles are modified, and you have to go out of your way to not commit these makefile changes together with your actual code changes.

Maybe it would be better to move these to a different name like Makefile.static so that they can be used for this special purpose and not conflict with the generated ones?

mlcc and mlclient have a static makefile shipped under the same filename
as the generated makefile.

Running configure overwrites these static makefiles with generated ones.
That causes git to detect a file change in these makefiles, prevent most
operations, and suggesting to include these changes in new commits.

Move the makefiles away to prevent issues.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
@arakiken arakiken merged commit 71d051f into arakiken:master Mar 4, 2023
@arakiken
Copy link
Owner

arakiken commented Mar 4, 2023

Thank you. I merged.

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Apr 4, 2023
pkgsrc changes:
* make mlconfig.po installed properly (#66)
* remove local patches integrated into upstream

Upstream changes (noted in doc/en/ReleaseNote):

ver 3.9.3
* mlterm-wl supports xdg-decoration.
* Add --disable-compact-truecolor option to ./configure script.
* Add vte 0.68 API symbols to libvte compatible library.
* Add libvterm 0.2 API symbols to libvterm compatible library.
* Add --sdpr / simple_scrollbar_dpr option.
  (arakiken/mlterm#64)
* Set "COLORTERM=truecolor" environmental variable.
  (arakiken/mlterm#36)
* Update unicode property table (generated from UnicodeData.txt and
  EastAsianWidth.txt) to version 15.0.0.
* Support mosh-1.4.0.
* Merge patches:
  arakiken/mlterm#45.
  arakiken/mlterm#46.
  arakiken/mlterm#48.
  arakiken/mlterm#49.
  arakiken/mlterm#55. (Add --role / wm_role option)
  arakiken/mlterm#57.
  arakiken/mlterm#61.
  arakiken/mlterm#62.
  arakiken/mlterm#63.
* Bug fixes:
  Fix arakiken/mlterm#34.
  Fix arakiken/mlterm#35.
  Fix arakiken/mlterm#39.
  Fix arakiken/mlterm#44.
  Fix arakiken/mlterm#50.
  Fix arakiken/mlterm#51.
  Fix arakiken/mlterm#53.
  Fix https://twitter.com/isaki68k/status/1555895011991883783.
  Fix segfault in starting mlterm with --dyncomb and --otl.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants